From 165315a2be04b457a3450ff1596bb0cec908c174 Mon Sep 17 00:00:00 2001 From: Robert Lipe Date: Sun, 22 Jul 2018 01:41:05 -0500 Subject: [PATCH] Allow field options in ifield, ofield Options can make fields.size() of 4, so loosen error test for those. Misc warning fixes. --- xcsv.cc | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/xcsv.cc b/xcsv.cc index 8fbcc69e3..75c1b44d2 100644 --- a/xcsv.cc +++ b/xcsv.cc @@ -211,8 +211,7 @@ xcsv_get_char_from_constant_table(const char* key) static void xcsv_parse_style_line(char* sbuff) { - int i, linecount = 0; - char* s, *sp; + char* sp; char* p; const char* cp; const char* key, *val, *pfc; @@ -381,8 +380,8 @@ xcsv_parse_style_line(char* sbuff) QStringList fields = QString(&sbuff[6]).split(",", QString::KeepEmptyParts); // Note: simplifieid() has to run after split(). - if (fields.size() != 3) { - Fatal() << "Invalied IFIELD line: " << sbuff; + if (fields.size() < 3) { + Fatal() << "Invalid IFIELD line: " << sbuff; } // The key ("LAT_DIR") should never contain quotes. @@ -420,8 +419,8 @@ xcsv_parse_style_line(char* sbuff) QStringList fields = QString(&sbuff[6]).split(",", QString::KeepEmptyParts); // Note: simplifieid() has to run after split(). - if (fields.size() != 3) { - Fatal() << "Invalied IFIELD line: " << sbuff; + if (fields.size() < 3) { + Fatal() << "Invalid OFIELD line: " << sbuff; } // The key ("LAT_DIR") should never contain quotes. -- 2.30.2